Fix textures not exporting after loading a world that uses obj models #874
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ddengster <ed.fan@osrfoundation.org>
Signed-off-by: ddengster <ed.fan@osrfoundation.org>
ahcorde
requested changes
Jun 22, 2021
| TEST_F(ColladaWorldExporterFixture, ExportWorldMadeFromObj) | ||
| { | ||
| ignition::common::setenv("IGN_GAZEBO_RESOURCE_PATH", | ||
| (std::string(PROJECT_SOURCE_PATH) + "/test/worlds:" + |
There was a problem hiding this comment.
Please use ignition::common::JoinPaths here and below
Signed-off-by: ddengster <ed.fan@osrfoundation.org>
ahcorde
approved these changes
Jun 23, 2021
|
@chapulina Looks like the tests failing are unrelated to this PR. Are there any other blockers for this PR? |
chapulina
reviewed
Jul 20, 2021
7 tasks
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🦟 Bug fix
Summary
When exporting via the collada world export plugin, if the world was made using obj models the textures will not export.
The fix is a simple conditional change from
if (_matIndex < 0)toif (newMatIndex < 0). The prior condition ensures that the block of code on line 124 will never execute given the circumstances, which is certainly a bug.I've also added a test that checks the existance of the textures exported. You can run the new test
./build/ignition-gazebo5/bin/INTEGRATION_collada_world_exporterfrom your ignition workspace.Related: #802
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge